# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1687863903 -7200
#      Tue Jun 27 13:05:03 2023 +0200
# Node ID f03fb79d2d55a0e7afd6dd7cf15fe442f79ff6d3
# Parent  e5498d633f47c95891aa22ec354a6b19e3bf5260
utils: avoid using internal _imp.is_frozen()

imp has been deprecated for a long time, and were removed in Python 3.12 . As a
workaround, we started using the internal _imp. That is ugly and risky.

It seems less risky to get the functionality in some other way. Here, we just
inspect if 'origin' of the '__main__' module is set and 'frozen'. That seems to
work and do the same, and might be better than using the internal _imp
directly.

This way of inspecting module attributes seems to work in some test cases, but
it is a risky change. This level of importlib doesn't have much documentation,
a complicated implementation, and we are dealing with some odd use cases.

diff --git a/mercurial/utils/resourceutil.py b/mercurial/utils/resourceutil.py
--- a/mercurial/utils/resourceutil.py
+++ b/mercurial/utils/resourceutil.py
@@ -8,7 +8,6 @@
 # GNU General Public License version 2 or any later version.
 
 
-import _imp
 import os
 import sys
 import typing
@@ -32,7 +31,12 @@ def mainfrozen():
     return (
         hasattr(sys, "frozen")  # new py2exe
         or hasattr(sys, "importers")  # old py2exe
-        or _imp.is_frozen("__main__")  # tools/freeze
+        or getattr(
+            getattr(sys.modules.get('__main__'), '__spec__', None),
+            'origin',
+            None,
+        )
+        == 'frozen'  # tools/freeze
     )
 
 

_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@lists.mercurial-scm.org
https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel